Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Thu, 13 May 2010 12:10:13 +0000 (12:10 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Thu, 13 May 2010 12:10:13 +0000 (12:10 +0000)

Trivial merge